bitkeeper revision 1.1159.212.58 (41fb7bc3vOj1TsfbXqfUKqcc2wjisA)
authorkaf24@viper.(none) <kaf24@viper.(none)>
Sat, 29 Jan 2005 12:04:19 +0000 (12:04 +0000)
committerkaf24@viper.(none) <kaf24@viper.(none)>
Sat, 29 Jan 2005 12:04:19 +0000 (12:04 +0000)
Merge viper.(none):/home/kaf24/xen-2.0-testing.bk
into viper.(none):/home/kaf24/xen-unstable.bk

1  2 
BitKeeper/etc/logging_ok
linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile

Simple merge